Fixed up a few things during transition to NetBeans