Readded a few things that were accidentally removed