Clean up some oversights