Bug fixes :(