Fix issues listed at https://critic.hoppipolla.co.uk/r/354