Small cleanups misc

Merged Bitbucket Importer requested to merge bitbucket/merged-pr-373 into branch/small-cleanups-misc