Fixes before push