fixes for standalone setup