Numerous fixes for this and that