Fixes for mistakes made by working too late on Friday night