Initial changes for wheezy