Fix various: 20141216