Minor updates to remove warnings in eclipse