Final fixes, should work