Merge banner fixes and parsing error fixes into dev

2 fixes into dev