small modifications for a better build-support