Bug fixes. Sorry.