Try to work around more bugs