minor changes to prevent errors (in a dumb way)