Fixes to avoid tickets

Watch this space for articles regarding