Updated packages and fixed what's broken