Fix on several messages and auxiliar functions