Small fixes according to feedback