Fixes and scripts