Commited too early :P

More time fixes