Finished fixes.