Fixed all changes that broke things