Fixed some height calc logic issues