Fixes requested by tobami@