Fixing random warnings