Fixing startup script issues and a poor implementation of limits