fixed minor post-merge bugs