Last fixes before apocalypse