Fixes after pulling develop branch of upstream