Minor fixes due to eclipse being stupid