Some fixes

Various fixes including plants with shears, improvements to internal
code, etc.