Fixes for FirstGen