Last fixes and scripts