Couple config improvements for development