Releasing fixes by H. Merijn Brandt