Updating the app to be a bit safer to run on the bbb