Warning cleanup (unused variables...)