More annoying file fixes from copying code