Some minor Fixesé