[569] Fixes