minor performance issues