Makefile and xerbla fixes