Make two fields public and fix a warning