Fixes for 520, 523 and 52