small changes to keep the Maven compiler happy