Fixed prices and removed Java 8 references