Dev: small changes