Last fixes;