Minor bugfixes
Minor bugfixes