Pulling some fixes from CodeCanvas