Fix stray $ and 'no mapping found' errors