Some minor fixes after 9 months!