Last fixes and publishing