Minor bugfixes
Minor bugfixes #02