Fixing gustavo issues