fix Mosby issues