small changes to ensure compilation runs smoothly