Fix bourbon problems