Bug fixes :)