Minor fixes to address build errors