Small fixes/changes