Making some fixes for SDK so it can be consumed from another project