some fixes and manual steps