Few changes to get things working again