Few fixes, pro tips from amarciniak