A load more fixes