Fixes as per Hironao's comments (#8)