Fixed stuff I missed but found upon diff review
Migration ready for debugging