Misceanelous trivial fixes