spick bugfixes