fixes for zero-k