Fixes and new scripts around