Fix init definitions