Fix bad log and messages