Fixed errors from staging