Fix basic stuff