Add postfix and other fixes