Various cleaning up and configuration fixes.