Minor changes/fixes