Extension loading + fixes