Fixed "unused variable" errors