SW-1 Fixes after CodeReview