Minor adjustments to work with netbeans