Minor fixes

Fixed small bugs during test install (CAPRA!!!)