Add some quick fixes