More bug fixes; Code-size has blown up for unknown reason