More bug fixes - interfaces throwing things off.