Some more changes for type checker constraints