Fixes failing tests and minor updates.