Moving something and fixing some deprecation issues