Fixed compile time issues