Changes before bug bashing