Fixing various warnings / imports