Fixes to 1-2