Additional acp module tweaks