More 1am fixes