Some littles bug fixes