First set of fixes for comments from CK