Minor fixes before lunch :)