Bug fixes :D