Fixing issues from CK