Bug fixes, functional until next round.