base fixes