Just some fixes