Fix #1247 - entry0 has the wrong size in `pxa`
fixes #1210 and some other small issues