Minor bugfix
Minor polish