K30/J25/J30 Backend: Clean up and bug fixes.