Last fixes before first beta