Bourbon Compatibility Fixes