fixed errors from merging bleeding edge branch