Hong Kong trip

Bug fixes whilst travelling to HK.