Some approval tweaks
more approval cleanup