Fix for unused variables