Fixed compile time bugs