Minor bugfixes with names