Updates to make things not so platform dependent