Fixes for tiny4