Fix migrations
Fix some JS issues