Temporary fixes and formatting changes