Small changes to work in NetBeans