saloon bug fixes