Forgot to close some connections, also checkstyle fix