Removing warnings due to obsolete calls etc