Extensions and fixes all around.