Minor conventions cleanups