Version 2.36.3 - build fixes