Bug/cosmetic fixes