Version 2.36.4 - build fixes