fixes for work