Buffer loading, fixes