Misc updates as per @henrikhodne's suggestions.