Some compile time issue fixes...