added latest build fixes