BROKEN COMMIT - Minor changes and misc. stuff from June 14 onwards