Fixes according to notes on req #55