Fixes as per Seb's suggestions