Partial fixes for comments from YU