Student fixes