Minor fixes failed build