static fixes for lib