Complilation fixes