* Small update fixing minor misbehaviours