Fixes according to suggestions