Fixes as per #5