Fixed stuff after bundle update