Minor fixes needed for it to work correctly