ticket:3 fixes according to comments