Interim commit - bug fixes