Minor Fixes

#536