Fixes for compactibility