Fixing a couple of small bugs (and removing that ugly pattern06)