New fixes for even more versitileness