Adds some bug fixes.