Added more strict compiler checks