Small fixes to match PS behavior