Small fixes after some refactoring.
Updated init.d script with bootstrap function