Minor corrections to prepare component for release