NetBeans related changes