Cosmetic changes, bugfix