Morning commit

Small fixes