Last minute changes
Updates for devoxx