A few overnight bugs fixed