Made fixes