Fixing stupid issues