Review res fixes

Fixes for issues mentioned in #819.