Comestic and logout fix