Improvements after bug bash