Bug fixes cos I can't read.