Small code fixes

Oneliners