More hacking/fixing