Bug fixes (I'll test next time)