Postfix fixes and small modifications