APW tweaks