Pulling in changes from Micke's fork