Fixes some immediate bugs 2.