fixes for linking