Fix minor compiler and dependency issues