Some minor changes regarding forms