Fixes to copy and paste...