NO_EXTENSIONS fixes

Trac #52

Signed-off-by: Andy Green <andy.green@linaro.org>