Some small time fixes...