Fixed NetBeans issues