Some lame fixes