Fixed errors with other platforms