Fixes for Carbine's lack of consistency =P