Compilation fixes and package/link change