* Lots of non-functional changes (to comply with old patch)