Fixes to make things work with multiple gopaths