Minor changes, probably needs fixing