Fixes for make flexibility