Some fixes (will squash after review)