Minor fixes to fit my needs.