Fix bug tracking check changes introduced with prev commit... also switch to spaces for indentation