Few small fixes

Suggested by flycheck.