Some additional sanity fixes