Corrected compile issues