Proper Release handling

Multiple bug fixes after API tests.