Finished fixes