Fixes according to @adrianmacneil notes