Quiet warnings and misc cleanup [0]