Small fixes + cleanup