Some tiny fixiex