Fixes to match version 0.0.19 of source.