minor bug/compilation fixes