Some nice fixes in interface/class declarations