Some minor fixes :P