Last fixes *crosses fingers*