Removing two warnings;