Some optionals fixed

## What? Why?
With beta6 some methods returned not optionals but with beta7 these returned items turned into optionals

## What should be tested?
The library works

## Related tasks? 
No related task
![image](http://media.giphy.com/media/y9VV9tmOwfDxu/giphy.gif)