Fixes as per #4