All around fixes