small simplifications
make server compilable without RPI flag