Fix it all!

Fix it all!