Made some fixes for alternate forms