Bug fixes again