fix some cancan bugs