Finished v15.2 tweaks